merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 15 Apr 2008 17:09:46 +0000 (11:09 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 15 Apr 2008 17:09:46 +0000 (11:09 -0600)

Trivial merge